From 251675e107d69bc486daeb2fe0758bdaf5536877 Mon Sep 17 00:00:00 2001
From: "arun.sharma@intel.com[kaf24]" <arun.sharma@intel.com[kaf24]>
Date: Thu, 24 Feb 2005 09:38:55 +0000
Subject: [PATCH] bitkeeper revision 1.1236.1.8
 (421da0af_4ZHSxnqpym3nlttZ_d5fQ)

[PATCH] term.patch

Enable text and RFB interface in the device models

Signed-off-by: Arun Sharma <arun.sharma@intel.com>

===== gui/Makefile 1.2 vs edited =====
---
 tools/ioemu/gui/Makefile     | 2 +-
 tools/ioemu/include/config.h | 4 ++--
 tools/ioemu/iodev/Makefile   | 2 +-
 tools/ioemu/iodev/main.cc    | 4 ++++
 4 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/tools/ioemu/gui/Makefile b/tools/ioemu/gui/Makefile
index 52ce67bd20..e6ddc74e06 100644
--- a/tools/ioemu/gui/Makefile
+++ b/tools/ioemu/gui/Makefile
@@ -1,6 +1,6 @@
 TOPDIR= ..
 CXXFLAGS=-I. -I../include -I..
-OBJS= gui.o keymap.o siminterface.o textconfig.o x.o
+OBJS= gui.o keymap.o siminterface.o textconfig.o x.o rfb.o term.o
 
 all: libgui.a
 
diff --git a/tools/ioemu/include/config.h b/tools/ioemu/include/config.h
index e48f2d97e5..53a72b282f 100644
--- a/tools/ioemu/include/config.h
+++ b/tools/ioemu/include/config.h
@@ -388,8 +388,8 @@
 #define BX_WITH_MACOS 0
 #define BX_WITH_CARBON 0
 #define BX_WITH_NOGUI 0
-#define BX_WITH_TERM 0
-#define BX_WITH_RFB 0
+#define BX_WITH_TERM 1
+#define BX_WITH_RFB 1
 #define BX_WITH_AMIGAOS 0
 #define BX_WITH_SDL 0
 #define BX_WITH_SVGA 0
diff --git a/tools/ioemu/iodev/Makefile b/tools/ioemu/iodev/Makefile
index 3a43661918..964f61485d 100644
--- a/tools/ioemu/iodev/Makefile
+++ b/tools/ioemu/iodev/Makefile
@@ -2,7 +2,7 @@ TOPDIR= ..
 CXXFLAGS=-I. -I../include -I..
 OBJS=$(patsubst %.cc,%.o,$(wildcard *.cc))
 BXLIBS = ../gui/libgui.a ../memory/libmemory.a  
-LDLIBS= $(BXLIBS) -L/usr/X11R6/lib -lX11 -lXpm -lstdc++ -L ../../../tools/libxc -L ../../../tools/libxutil -lxc -lxutil
+LDLIBS= $(BXLIBS) -L/usr/X11R6/lib -lX11 -lXpm -lstdc++ -L ../../../tools/libxc -L ../../../tools/libxutil -lxc -lxutil -lpthread -lncurses
 
 all: device-model
 
diff --git a/tools/ioemu/iodev/main.cc b/tools/ioemu/iodev/main.cc
index c784adb555..e82f47d2f4 100644
--- a/tools/ioemu/iodev/main.cc
+++ b/tools/ioemu/iodev/main.cc
@@ -1964,6 +1964,10 @@ bx_bool load_and_init_display_lib () {
   if (!strcmp (gui_name, "x")) 
     PLUG_load_plugin (x, PLUGTYPE_OPTIONAL);
 #endif
+#if BX_WITH_TERM
+  if (!strcmp (gui_name, "term"))
+    PLUG_load_plugin (term, PLUGTYPE_OPTIONAL);
+#endif
 
 #if BX_GUI_SIGHANDLER
   // set the flag for guis requiring a GUI sighandler.
-- 
2.30.2